From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Apr 2012 19:51:35 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~2599
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c6046b94e58b33ddcfca8f6361ddaf780ba5cb18;p=emacs.git

Merge from trunk.
---

c6046b94e58b33ddcfca8f6361ddaf780ba5cb18